Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Custom updater modal #1738

Merged
merged 24 commits into from
Apr 17, 2024
Merged

Custom updater modal #1738

merged 24 commits into from
Apr 17, 2024

Conversation

pierremtb
Copy link
Collaborator

@pierremtb pierremtb commented Mar 15, 2024

Todo:

  • Update branch to main (stuck in the past on purpose so we always get dialogs for dev)
  • Figure out how we can actually test this (added component tests for now)

@franknoirot I'll let you provide guidance on UI and UX. That's the current state of things

image image

Tested on Windows too (no relaunch modal as it opens the msi directly)
image

Copy link

vercel bot commented Mar 15, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
modeling-app ✅ Ready (Inspect) Visit Preview Apr 17, 2024 9:57am

@pierremtb pierremtb changed the title Pierremtb/issue1663 WIP: custom updater modal Mar 18, 2024
@franknoirot
Copy link
Collaborator

Oh sick @pierremtb! I was just about to ask how it handles a long change log before you updated the image, perfect.

Could we get the markdown to render as HTML?

My only thoughts while mocking up this were:

  1. Show a Zoo logomark in the overlay so that it feels more like an official notice
  2. Reuse the styling we have on the "Alpha" pill from the onboarding to highlight the version number
  3. Render the markdown to HTML to get better list styling especially

Updater Dialog

(Ignore the button styling and the fact that this modal has opened over the /file page view. The buttons are the next look-and-feel and I haven't gotten a good mockup of the home view yet)

@pierremtb
Copy link
Collaborator Author

pierremtb commented Mar 18, 2024

Awesome thank you @franknoirot! I'll update it to match the mockup.

Yeah we can use Marked.parse from https://github.com/ts-stack/markdown that we already depend on and inject the result. Just have to figure out how to do it safely

@pierremtb
Copy link
Collaborator Author

image

With v0.16.0. We're still missing the bullet points (due to inheritance and I really know how to fix it yet). Will update to main

@pierremtb pierremtb changed the title WIP: custom updater modal Custom updater modal Mar 21, 2024
Copy link

codecov bot commented Mar 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.45%. Comparing base (dd51eec) to head (9809c85).
Report is 4 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1738   +/-   ##
=======================================
  Coverage   86.45%   86.45%           
=======================================
  Files          54       54           
  Lines       22424    22424           
=======================================
  Hits        19387    19387           
  Misses       3037     3037           
Flag Coverage Δ
wasm-lib 86.45% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pierremtb
Copy link
Collaborator Author

Moved to draft until we merge #1400 (already rebased on it)

@pierremtb pierremtb changed the base branch from main to pierremtb/issue1349 April 8, 2024 10:39
@pierremtb pierremtb changed the base branch from pierremtb/issue1349 to kurt-xstate-set-selection-clean-up April 8, 2024 10:40
@pierremtb pierremtb changed the base branch from kurt-xstate-set-selection-clean-up to main April 8, 2024 10:40
@franknoirot
Copy link
Collaborator

Yeah no worries on the bullet points, I might be able to take a look at the CSS and fix in a follow-up PR if you should me how to test it in dev @pierremtb.

@pierremtb
Copy link
Collaborator Author

@franknoirot Sounds good! Let's wait for the next update, this branch is easier to test when it's a version behind :)

@pierremtb
Copy link
Collaborator Author

@franknoirot Waiting on another nightly build to verify that the regular update flow still works as expected. After that I think we should trigger a release, and then get on with this one

@pierremtb
Copy link
Collaborator Author

Okkkkk @franknoirot we need this merged sooner than later actually 😅 I don't know how I missed this during the migration to tauri v2 #1400

The built-in dialog with an automatic update check was removed, use the Rust and JS APIs to check for and install updates instead.
from https://beta.tauri.app/guides/upgrade-migrate/from-tauri-1/#migrate-to-updater-plugin

We can fake a nightly build locally and point to https://storage.googleapis.com/dl.kittycad.io/releases/modeling-app/nightly/last_update.json with the following

VERSION=24.4.16 yarn bump-jsons
echo "$(jq --arg url 'https://dl.zoo.dev/releases/modeling-app/nightly/last_update.json' \
            '.plugins.updater.endpoints[]=$url' src-tauri/tauri.release.conf.json --indent 2)" > src-tauri/tauri.release.conf.json
echo "$(jq --arg id 'dev.zoo.modeling-app-nightly' \
            '.identifier=$id' src-tauri/tauri.release.conf.json --indent 2)" > src-tauri/tauri.release.conf.json
echo "$(jq --arg name 'Zoo Modeling App (Nightly)' \
            '.productName=$name' src-tauri/tauri.release.conf.json --indent 2)" > src-tauri/tauri.release.conf.json
yarn tauri build -b -c ./src-tauri/tauri.release.conf.json
./src-tauri/target/release/Zoo\ Modeling\ App\ \(Nightly\)
image

@franknoirot franknoirot merged commit b13c133 into main Apr 17, 2024
20 checks passed
@franknoirot franknoirot deleted the pierremtb/issue1663 branch April 17, 2024 14:30
@franknoirot franknoirot mentioned this pull request Apr 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants